From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 30 Jul 2019 20:34:23 +0000 (-0400)
Subject: build: We no longer need freetype
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~321^2^2~663^2~3
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fa8ce17e1e1922ff83d49231427cb2e8a3f3d10a;p=gtk4.git

build: We no longer need freetype
---

diff --git a/meson.build b/meson.build
index dec20736d5..ec8291540e 100644
--- a/meson.build
+++ b/meson.build
@@ -335,33 +335,6 @@ fribidi_dep    = dependency('fribidi', version: fribidi_req,
 require_pangoft2 = wayland_enabled or x11_enabled
 pangoft_dep    = dependency('pangoft2', required: false)
 
-if pangoft_dep.found()
-  # Need at least 2.7.1 for FT_Get_Var_Design_Coordinates()
-  # We get the dependency itself from pango, but pango doesn't care
-  # about ft2 version, so an extra check is needed.
-  ft2_dep      = dependency('freetype2', version: '>= 2.7.1', required: require_pangoft2)
-
-  # Fallback case: Look for the FreeType2 headers and library manually when its .pc
-  # file is not available, such as on Visual Studio
-  if not ft2_dep.found()
-    ft2lib = ft2_dep
-    if cc.has_header('ft2build.h')
-      ft2_libnames = ['freetype', 'freetypemt']
-      foreach lib: ft2_libnames
-        if not ft2_dep.found()
-          ft2lib = cc.find_library(lib)
-          # If the FreeType2 library is found, check for FT_Get_Var_Design_Coordinates()
-          if ft2lib.found()
-            if cc.has_function('FT_Get_Var_Design_Coordinates', dependencies: ft2lib)
-              ft2_dep = ft2lib
-            endif
-          endif
-        endif
-      endforeach
-    endif
-  endif
-endif
-
 if require_pangoft2
   pangoft_dep    = dependency('pangoft2', fallback : ['pango', 'libpangoft2_dep'])
 endif